Merge branch 'places-sidebar'
authorFederico Mena Quintero <federico@gnome.org>
Fri, 19 Apr 2013 22:26:39 +0000 (17:26 -0500)
committerFederico Mena Quintero <federico@gnome.org>
Fri, 19 Apr 2013 22:26:39 +0000 (17:26 -0500)

Trivial merge